Skip to content

Bug 1806009: Backport ovn-kubernetes-related changes to 4.3#483

Merged
openshift-merge-robot merged 9 commits intoopenshift:release-4.3from
danwinship:ovn-kube-rebase
Feb 27, 2020
Merged

Bug 1806009: Backport ovn-kubernetes-related changes to 4.3#483
openshift-merge-robot merged 9 commits intoopenshift:release-4.3from
danwinship:ovn-kube-rebase

Conversation

@danwinship
Copy link
Contributor

Backport of all as-yet-unbackported ovn-kubernetes-related fixes to 4.3

Includes:

Does not include:

squeed and others added 6 commits February 18, 2020 11:18
Add a PodDisruptionBudget to protect the raft quorum.

Configure a readines probe for the DBs: ovsdb raft only opens its port
once it has a raft consensus. Utilize that.

Also, add a TerminationMessagePolicy.

(cherry picked from commit b2f02b3)
Since these services are just used to configure Prometheus scrape
targets, rather than load-balance traffic, we should not remove
not-ready addresses from them.

(cherry picked from commit f9cdcff)
(cherry picked from commit 484aa15)
(cherry picked from commit ab9f0fc)
It's ovnkube-master not ovn-kubernetes-master.

(cherry picked from commit b767fd7)
Configure ovnkube using a config file passed by the ovnkube-config
configMap and mounted into the container.

(cherry picked from commit eb3b64d)
(cherry picked from commit 4bda7b7)
(cherry picked from commit a520900)
(cherry picked from commit 79bb2b8)
(cherry picked from commit ec6812f)
SDN-494 - ovn custom geneve port number.
https://jira.coreos.com/browse/SDN-494

Signed-off-by: Phil Cameron <pcameron@redhat.com>
(cherry picked from commit f1b6046)
@openshift-ci-robot
Copy link
Contributor

@danwinship: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

Backport ovn-kubernetes-related changes to 4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 18, 2020
@danwinship
Copy link
Contributor Author

/cc @dcbw @pecameron @rcarrillocruz
/test e2e-gcp-ovn
/test e2e-aws-ovn

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 18, 2020
@russellb
Copy link

I tried an install with this and got:

level=error msg="Cluster operator network Degraded is True with ApplyOperatorConfig: Error while updating operator configuration: could not apply (apps/v1, Kind=DaemonSet) openshift-ovn-kubernetes/ovnkube-node: could not create (apps/v1, Kind=DaemonSet) openshift-ovn-kubernetes/ovnkube-node: DaemonSet.apps \"ovnkube-node\" is invalid: spec.template.spec.containers[0].volumeMounts[4].name: Not found: \"old-openvswitch-database\""
level=info msg="Cluster operator network Progressing is True with Deploying: DaemonSet \"openshift-multus/multus-admission-controller\" is not yet scheduled on any nodes\nWaiting for DaemonSet \"openshift-ovn-kubernetes/ovnkube-node\" to be created"
level=info msg="Cluster operator network Available is False with Startup: The network is starting up"

ovn2.12 places the ovn-ctl script in a different directory than earlier
versions. This uses the correct path for the installed version.

(cherry picked from commit 3fca003)
(cherry picked from commit 2711b32)
@russellb
Copy link

Tested again, this time ovnkube-node is failing, because it seems it got configured with an IPv4 subnet.

time="2020-02-19T18:09:26Z" level=fatal msg="invalid hostsubnet found for node master-2.ostest.test.metalkube.org: invalid CIDR address: 10.129.0.0/64"

@danwinship
Copy link
Contributor Author

yeah, I guess the change to use the config file requires the corresponding ovn-kubernetes fix to not accidentally replace the config options with the defaults

@russellb
Copy link

yeah, I guess the change to use the config file requires the corresponding ovn-kubernetes fix to not accidentally replace the config options with the defaults

upstream: ovn-kubernetes/ovn-kubernetes#1044

openshift master: openshift/ovn-kubernetes#93

@pecameron
Copy link
Contributor

pecameron commented Feb 21, 2020

@danwinship I included #458, #454, and #443. PTAL and see if you think they should be included.

Copy link
Contributor

@pecameron pecameron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 21, 2020
@pecameron
Copy link
Contributor

e2e-upgrade-gcp has OOMKilled messages in the journals
$ grep OOMKilled e2e-gcp-upgrade/nodes/masters-journal |wc -l
21
$ grep OOMKilled e2e-gcp-upgrade/nodes/workers-journal |wc -l
5

/test e2e-gcp-upgrade

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@danwinship
Copy link
Contributor Author

@danwinship I included #458, #454, and #443. PTAL and see if you think they should be included.

458 only changes sdn-specific stuff
454 is a multus thing which was just to meet new validation requirements for 4.4.
443 is only needed to support the migration tool, which won't be supported in 4.3.

so I don't think any of those are needed

@danwinship danwinship changed the title Backport ovn-kubernetes-related changes to 4.3 Bug 1806009: Backport ovn-kubernetes-related changes to 4.3 Feb 21, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 21, 2020
@openshift-ci-robot
Copy link
Contributor

@danwinship: This pull request references Bugzilla bug 1806009, which is invalid:

  • expected dependent Bugzilla bug 1806006 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is NEW instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1806009: Backport ovn-kubernetes-related changes to 4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@danwinship
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Feb 21, 2020
@openshift-ci-robot
Copy link
Contributor

@danwinship: This pull request references Bugzilla bug 1806009, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@pecameron
Copy link
Contributor

@danwinship Are you happy with the bumo to ovn2.12 with 2.12 in its current state? @dcbw was talking about backports coming.

@danwinship
Copy link
Contributor Author

The bumping-to-2.12 here is just updating for the changed paths. Further ovn-kubernetes backports won't affect that.

@danwinship
Copy link
Contributor Author

/test e2e-gcp-ovn
/test e2e-aws-ovn

@alexanderConstantinescu
Copy link
Contributor

@danwinship : could you add this commit to the list of cherry-picks for this PR (the master PR has been merged now)?

31476cc

@russellb
Copy link

patch manager note: this is required for Ipv6 support

@knobunc
Copy link
Contributor

knobunc commented Feb 25, 2020

This depends on openshift/ovn-kubernetes#100

dcbw added 2 commits February 25, 2020 15:35
Rather than connecting to the database TCP socket which just spams the
database logs with failed SSL connection messages.

(cherry picked from commit 876e67a)
(cherry picked from commit 31476cc)
When terminated gracefully, either via 'ovs-ctl stop' or TERM,
ovs-vswitchd cleans up datapath flows. This prevents any existing
flows from continuing to work, which kinda defeats the purpose of
a seamless upgrade.

The preStop hook is removed because it is redundant with the
TERM trap of the container's main process bash script.

(cherry picked from commit 2f543fa)
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 25, 2020
@danwinship
Copy link
Contributor Author

@danwinship : could you add this commit to the list of cherry-picks for this PR (the master PR has been merged now)?

done (squashed with the original patch from dcbw)

@russellb
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 25, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, pecameron, russellb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@eparis eparis added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 26, 2020
@eparis
Copy link
Member

eparis commented Feb 26, 2020

/retest
level=error msg="Error: Error applying IAM policy to project \"openshift-gce-devel-ci\": Too many conflicts. Latest error: Error setting IAM policy for project \"openshift-gce-devel-ci\": googleapi: Error 409: There were concurrent policy changes. Please retry the whole read-modify-write with exponential backoff., aborted" Is not this PR

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 0ccb533 into openshift:release-4.3 Feb 27, 2020
@openshift-ci-robot
Copy link
Contributor

@danwinship: All pull requests linked via external trackers have merged. Bugzilla bug 1806009 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1806009: Backport ovn-kubernetes-related changes to 4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.